From 8eb97be96640824ce36b989a56f1851f09bab57e Mon Sep 17 00:00:00 2001 From: Robert Lipe Date: Tue, 18 Dec 2018 22:56:45 -0600 Subject: [PATCH] Make types in ggv_bin more safe for 32/64 systems. --- ggv_bin.cc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ggv_bin.cc b/ggv_bin.cc index 40cdfa1dc..d009b4f48 100644 --- a/ggv_bin.cc +++ b/ggv_bin.cc @@ -37,7 +37,7 @@ static QString read_fname; ***************************************************************************/ static void -ggv_bin_read_bytes(QDataStream& stream, QByteArray& buf, qint64 len, const char* descr = nullptr) +ggv_bin_read_bytes(QDataStream& stream, QByteArray& buf, int len, const char* descr = nullptr) { buf.resize(len); if (stream.readRawData(buf.data(), len) != len || stream.status() != QDataStream::Ok) @@ -133,7 +133,7 @@ ggv_bin_read_v2(QDataStream& stream) if (global_opts.debug_level > 1) qDebug("------------------------------------ 0x%llx", stream.device()->pos()); - quint64 entry_pos = stream.device()->pos(); + auto entry_pos = stream.device()->pos(); quint16 entry_type = ggv_bin_read16(stream, "entry type"); ggv_bin_read16(stream, "entry group"); ggv_bin_read16(stream, "entry zoom"); -- 2.30.2